improve message about incomplete images
cleanup some comments