code fixups, makefile