Remove commentedout code, tweak comments.
Merge branch 'addjartoshell' into bizo