added AND and OR comparison with bool and int