Fixes and Improvements
Small Changes