fix unaries better