misc: finish more TODOs

[georglauterbach]

Description

see commits

Fixes #53

Type of change

• New feature (non-breaking change which adds functionality)
• Improvement (non-breaking change that does improve existing functionality)
• This change requires a documentation update
• This change is a documentation update

Checklist

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation (README.md or the documentation under documentation/)
• If necessary I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes