Fixed up the configuration and script templates