Fix energy simulation bug and add unit to NEI