Updated makefile and words.l