name change,clean-ups,config change
drunken derp fix