Add more synchrony measures, some performance improvements