Sync Doc update

and some minor changes