Various updates to demo on device firmware update