added last c2x msg header+minor fixes