Update to Readme, some cleanup