Bit of bug fixing + trying the config thingy
Revert back to old config