updated makefile and moved some includes and added an temporaly return to toString()