Minor changes
Preparing interactive shell