Added demo name in config + minor fixes