changes throughout, also updated figs