Fixed Token spelling bug with subtraction operator
Cleaned up old TODOs