Improved ToDo and Slight Updates

Lots of references in ToDo, Removed Extraneous Managers