add some more-mode stuff