#21 some synchronizations fixed with server