Bug Fixes

2 enhancement requests and 23 bugs were closed