Add figure, fix units and finish