more mode fixes.