some fixes and adding shortcut to expand combo file