Bug Fixes

5 Bugs and 2 enhancement requests were closed