Fixed some bugs and modified GeomSolver2.java