dep on makefile, better grep support
more fixes