Update readme
Misc cleanup