Ship syncing and minor cleanup