Updated configuration files + small tweak