What are the motifs in Waldo by Robert A. Heinlein?

Waldo's transformation from an embittered, weak genius into a physical superman is an obvious spin-off from Faust and Nietzschean motifs. The greatness of Goethe's masterpiece is due, among other things, to a consistent following through in the bargain that Faust makes with Mephistopheles. Faust's reign of glory is always in the shadow of the final payment. Every ounce of energy that he receives demands its physical and emotional price.