lots of fixes for synchro and deletion