some fixes after review