Relative energies should be fixed

Had to make minor changes to to calculate.calculate_x2 because
it had incorrect references. Improved output of evaluate.py.