Changed some basic configuration