fixing configuration and other minor changes