170: Bugfix

Aug 28, 2017

A mix of bug fixes and feature improvements.