Improved makefile and started work on tokens