Improve Makefile and shebangs