adding Makefile, minor option changes