Small enhancements ... update figures, ...