Common improvements. Changed Makefile