Cleaned up the Manager, refactored some more stuff.