Fix all synchro bugs with big refactor