update figure, move some things