fixed few bugs in operators