Added multiple movie support and fixes bugs