#111 some fixes after review