* Some Cleanup
* Also a few Minor Tweaks