better actor handling in prep for gallery