Alterations made to main.cpp and makefile