Misc cleanup and update REAME.md