update gitignore
rework Makefile
few Makefile changes