updated simulation Makefile and Factory class