makefile and organisms update