@cekees fixes

Supercedes #68 and #67