Cleanup and make interchange work with multiple images.