Minor corrections
Update for 2.0
Ditto