major film & mf model refactorings