more fixes but adding movie is still buggy