#17 Incorporate new hyper-parameters into new model method

Two issues have arisen:
 - I’m bizarrely getting NaNs now, which never happened before
 - The scale of the free-energy has changed (it’s now 3-times greater)