massive conf update (thanks to spf13)