more enhancements, including image URIs