Added + as identifier
Fixed a bug where spaces were hanging around
Added some nasty code for whitespace swallowing... Not sure if I like
this