Various changes, more sync methods