qbe and some small changes