Upgrade to API v2
Typo fixes