More image tracking tweaks, primarily for debugging