synchronization + fixes