Fixed some makefile bugs, issues with tokens in the scanner