more wording changes
move Makefile over, too!