makefile fixups and dependency lists updated