Add "Not", and clear up some of the parser stuff