Reformat specs.
Updated README