Some changes and figure updates