fixes, synchronization, small bugifx