Updated config and modified some stuff