variable names
try to address Kelle's comments.  Unconvered some bugs in the
meantime...