#6 fixes after review