Bug fix and more types in drawing.
Define an EXTERNAL-INPUT type of input.
Adapt to new input conventions.