improve figures, yet again