Fix Image provider and documentor routine

Closes #223