Makefile improved. I hope...