Upgrade to 2.1.0
Fix a few typos