Made config more readable and other small changes