Bug Fixes And Other Minor Improvements