Added shutdown methods and tweaked ocnfig