Fixes and Improvements