sync, minor fixes