makefile updates; minor