Bug Fixes

10 Bugs and 12 enhancement requests were closed