Added support for specifying all parameters
Added option to toggle use of damping function in D3 from Energy.py
Gave variables meaningful names