modified drop to break ref cycles caused by dep, improved Makefile a little