more bug fixes + fixed sync issue