class updates and makefile