fixes, binary operators, and more tests