Submitted version; reorganized figs