bug fixes, synchronization, warnings