cleanup and README updates