4 bug fixes for release 0.1.9