Fix some of the more obvious bugs
Rework readme slightly