some structual changes to pixmap/image usage