Small updates to figure plotting