Fixed errors, fixed synchronisation