Added language checking and a few new tokenizing features