Syncing Fixes

and code corrections