Added config options. Delete all the old ones since they are crap.