Fix #185 and #186

This corrects some small bugs and omissions.

Update Changelog

closes #185
closes #186