Added all config changes and added additional features