Very minor additions/changes

Worked for about 10 minutes today. No major improvements to
functionality; just tweaked a couple things and added some place holders
to clarify what I'm thinking.