Energy statistics
	- Code improvments