Improved makefile
Some more functionality in env