Bug Fixes

2 enhancement requests and 3 bugs were closed