FIX: bugs, ADD:movie and xml