Make sure no missing indicators in output

Kind of a big pull request. You can test and merge. I'll make inline comments to notify people of things that need followup.