Bugfix several issues

Bugfix several issues:

- [ ] test coverage
- [ ] finish the code
- [ ] gather feedback for my changes
- [ ] submit changes to the documentation


| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | none
| Fixed tickets | #23 , #24 
| Doc           | none