Working towards v1.2

Fixes for the following:

- system76/beansbooks#163
- system76/beansbooks#165
- system76/beansbooks#166
- system76/beansbooks#39