Further improvements to shell