#171 fixes after review