Bug Fixes

22 Bugs and 2 enhancement requests were closed