Fixed bugs, added op and deop