Added unusual token handling, fixed typo