Updated Readme and cleaned up a bunch of things