Fixed that one niggling termination issue, also fixed a reference to deviceInfo