better shadow, correct production

Conflicts:
	GNUmakefile