small changes + makefile