tidied up sync, add full message check