More tidy up of the TODO and README