Added old config file + some substitution fixes