now synced, minor errors fixed