Makefile changes and some print statements for usability