A number of efficiency fixes and functions now in place for manual sync.