Fixed goal conditions. Still a hack (rN = gM done manually in pars.main.cpp).