Update Readme, cleanup.