Improved Makefile and completed A2