makefile and updated imports