sync + minor changes