clean up and get parens working, before working on unary operators