Don't think so, but I don't know if it is appropriate to add those values on either. It should probably be possible to generalize the output of the engines without knowing much about their internal workings, and calculate a power figure just knowing how much they are lifting and how fast.

This stuff is really straddling the line of physics that I remember and physics that I forgot/never learned, so... heavy dose of salt, etc.