Rename a few things. Improve the readme a bit