sync implemented
some tweaks