Fixed energy normalization and value rounding.
Final.
Merge origin/master