Shell enhancements and comments.
Cleanup comments.