image system in place, minor style changes