- passed "protocol_id" along back to device for each protocol
- other minor fixes

Signed-off-by:  <Greg>