Overprinting

OK, this is a try to integrate the latest changes distributed by a1270 into my fork.

Hi a1270 if this shows up at your fork .... just delete it.