synk: fix bug
synk: many internal fixes