Minor changes to get some unary operators to work, doesn't handle
negative numbers though