Makefile, MAINFILE and .cls updates