Added jump merging in optimizer, fixed bugs and if not being rvalues