Updated TODO list, and a couple small, small bugs!