Adding lexer and fixing Makefile