Replaced some more numeric stuff with the boolean vars.