Synchronization and bug fixes