rearranged alot of figures. cleaning up