new analysis, and corrections in plotting