Put movie data into queue too. Fix some minotr type, small code garden