bug fixes per #166

https://github.com/brightskylabs/then10/issues/166