A few more survey tweaks, plus a bunch of TODO comments for changes that could not be implemented right away.