Updated Readme and some cleanup