Bug Fixes

19 Bugs and 1 enhancement requests were closed