Various readme fixes

Closes gh-395
Closes gh-400
Another portion of readme fixes