Fixed much of the config changes, conf file tables left #19