More formatting fixes and minor README changes.