Bug Fixes

14 Bugs and 1 enhancement requests were closed