Synchronization and style fixes.