Performance improvements

... and improving expression printing