Hole keys fixed and minor problem with submenu-key behavior fixed