Synced and fixed most errors