fixed some sync issues