modified makefile, also checking in debugging code, but anyways