made matches based on words
fixed up makefile