Improving the makefile and adding forgotten files