Improvements to the interactive shell