Fixed bad comments on 'and' and 'or'
Substate