Altered the DemoCliApp listeners to listen for more events on different targets and fixed some swapped variables
Altered the DemoCliApp listeners to listen for more events on different targets and fixed some swapped variables

mkrause/gx,mkrause/gx