Errors corrected, solver updated (not working yet)