Added additional todos and fixed syntax bugs.