Config and demo Updates