Clean!!! + Make some configs that did nothing do what they were supposed to...