Removed outdated tokens. Added string and char tokens. Started changing lexer fns to return error tokens instead of result errors.
Merged code.