adjusted makefile and taxi