substantial cleanup, addition of figures, correction of #s