Several Improvements