[resolves #187] Review all [TODO] markers and add issue references