ready and compliant; makefile update