fixes (and rudimentary Makefile)