fix films, cut more dead weight, put some not-quite-dead weight back in