General updates

- [x] Fixes #180
- [x] Fixes #183 
- [x] Fixes #185