rework some of the image cache/loading to make it easier to implement image editing, misc other clean ups/condensing