Fix logging; fix termination
Use momentum
Update parameter file