#9 fixes after review