add Movie and minor fix