Added operators, fixed bugs, tests