config parsing improved