bug fix & parametric changes