Bugfix #1, #2. Major sync update, update to API v2