correct pictures show up for the shot type
fixed merge conflicts