sync fixes + reset