Finishing of reasoner (yay!), further corrections