better fix for "bad"s

I removed the extra "bad" definition in combo (credit goes to Jasmine
for finding this) and updated my fix for ending the level when 2 bads
are left.