#107 fixes after review