syncing bugfixes and tweaks