fixed makefile, updated output formatting