many minor cleanups
Many small tweaks
Sync finally fixed for real real