fixes #16 and initial sync circles implementation