Think I fixed the syncing issues. Needs more testing.