Add workaround for program counter issue and an impl for a few arithmetic ops