Update the Readme and do some stuff.

Fixes 1.
Fixes 2.