* Improve code organization. * Add some debug prints. * Fix some nits. svn path=/branches/shell-experiments/; revision=63787