Added some operators, minor adjustements