Bug Fixes and Improvements