Fixed token parser bug + typos