Makefile improved, gitignore expanded