Merged/Fixed  some stuff.
Ignore the config file.