Improved shell configuration a little