more fixes after review