synchronization fixes and testing