Add missing operator
Some bugfixes