#132 some improvements