README.md updates and corrections
(cherry picked from commit 291e4d7)