sync bugs corrected