different fixes after review