adding more modes to makefile; merged in extra script