some improvements in setup