rest of figures fixing.