Updating a few things...

Nothing major, just cleanup after first sync.