create sync indicator, enable re-sync and some bugfixes