Updates to Lexer

GARGH I DON'T HAVE TIME FOR STUFF LIKE THIS. DEADLINE IS APPROACHING :\