1.5 MASSIVE TODOS UPDATE

Added a fuckload of ToDos
(And fixed to easy bugs)