Bug Fixes

11 Bugs and 3 enhancement requests were closed