Tidy up, add a few todo items