Tidy up some TODOs, update README