updated figures and such