Add type distribution and handle case if there's no image

Title says it all

Merging