tidy up, fix and readme