tested numerical convergence vs old implementation, and fixed bug in model conversion