feature/#78

Description

Various small fixes.

Type

• Bug Fix
• Improvement
• New Feature

Checklist:

• I have read the CONTRIBUTING doc
• Lint and unit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works
• I have added necessary documentation (if appropriate)

Fixes #78 (closed)