V0.8 General Clean Up and Tweaks