Small fixes, new config options, a little cleanup here and there, etc.