some comment cleanup, and added ability to override container name in "shell" command