0.9.18 - incremental fixes from pull requests