Several Improvements and Fixes