More work on note sync