rearranged Makefile, fixed targets