Fix some logic derps, finally finish up the container syncing