Mostly figure updates.