Readme and other cleanup