Fix Readme and cleanup.