reinstated stuff after breaking makefile
minor tweak