Readme and some cleanup