Readme refactoring

Additional refactoring to readme to align with page and fix a couple of
mistakes.