Improved ToDo and Slight Updates

Lots of references in ToDo, Removed Extraneous Managers
Merge pull request #11 from CertainlyUncertain/Josh

Improved ToDo and Slight Updates