Fixing some math and improving the README a little.
Fixing merge conflict in README.