A few updates following client feedback.