Begun synchronization; added minor fixes