Improvements and Bug Fixes