Fixed more errors with syncing and a highlighting error.