Fixed a few things with the figures you had pointed out