small fixes after review