Changed listing code and Makefile to be more relevant to this project, rather than the project from which I copied them