Add master hostname to the configuration, remove some debug stuff