Cleanup, Tweaks and Readme update