Cleanup, fixes and README changes