Update readme.
Reformat source code and fix build.

Embarassing: broke the build without noticing, looks like cached files
had me believing everything was fine.