Improvements on the shell for the project