Completed tokenization. Changed Makefile to suppress warnings