Updated old names. Reduced automatic analysis to just energies and Q to save disk space