Some small enhancements to the shell programming