more fixes + first simplifier