many changes, scanner makefile is not useable