fixed bug in disqualify rules
more optimizer tweaks