Subset command back in menu
Subset back into menu
Minor cleanup