Bug fixes and refactoring

Should now tokenize increment and decrement correctly, and throws
errors.