Adding boolean expressions
Added some more boolean managment