Improvements and Fixes