minor changes to paper, figures, and code re-arrangement