Some images checking and clean-up.

Relates to #26.