make keys also commands
enhance stub-screen