Bug Fixes

13 Bugs and 6 enhancement requests were closed