Foxed more wraparound stuff and changed the energy message protobuf.