Fix Latex typos.
Add support for phi or q/p fixing separate from no-dCPV.