really fix up shell