Feature/issue fixing

fixes a few github issues:

- [x] finish the code
- [ ] gather feedback for my changes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | none
| Fixed tickets | yes #7, #9. #6 
| Doc           | none