some improvements in configuration