Added more Makefile targets and dependencies