Fixed the lexer
Updated makefile to potentially questionable ends