Feature merge

Merging Paul's text update contrib + my image display code