Antonio changes

With Antonio Rinaldi looking at updates to be made to HM1 from a scientific perspective, these changes have been applied and the code base had to be updated due to this and other updates that were found to be bugs in the model adaptor.