sugar, fix lexer and main makefile