Bug Fixes

18 Bugs and 3 enhancement requests were closed