Bug Fixes

19 Bugs and 3 enhancement requests were closed