#155 fixes after review