revisit power flow eqns; moved some stuff
oops. should use git to move/rename