added who is in movie x and who isn't in movie x
fixed merge issues