resolve miscellaneous todos

[ndegug]

Many todos across the program have been left off, some are duplicates. Resolve all of them.