local sync bugs fixed