corrected boolean conditions for options