Some tokeniser changes

Closes #19, primarily