cleanup debug print statements
add (and) and (or)