Finish 1.1.0 functionality

- [ ] #45 
- [ ] #42 
- [ ] #35