Add device info debug. This allowed a few bugs to be identified in the service wrappers. Bugs have been fixed.