fixing calloc(), fix Makefile