slight changes to makefiles; prior versions failed on other computers