renamed vars to be more consistent.
cleaned up cppm rx in a little, no use case yet.