Changed to work on PATH, improved Makefile