mod handles more simplification
fix unrad code in solve