few more polish commits on the shell