Updated Readme and clean up.