updated config
improved setup routine