changed solver to match new HEROS version
fixed a NullPointerException and made private what ought to be private right from the start