gauges demo updated to work with crossbar2, some cleanup