Makefile
a few small repairs
Merge pull request #420 from etosch/untested

Untested