small changes and fixes, seems operands get interchanged sometimes