Image handing introduced.

Cleanup.