Tweaking and Improvements