Updated/moved todo notes, small cleanups