Improvements to old TODOs

xref #121