more mode improvements