Fixes to synch engine bug

Was not synching properly with changes on both server and client