Readme and fixes