cleanup and readme improvements