Added little todo list, and did some cleanup.