fixes after review by florian