removed 2 TODOS (yay :D), but added 3 new ones (ohhh ;()