~ fixes after review 3