Fix #185 and #186

This corrects some small bugs and omissions.
This addresses the issue brought up in #185