allows p and/or q as inputs from eqdsk, improved q input solver, simplify tag numbering