v2.1.1 Various fixes and typos.