Better Makefile and lot of little things!