fixed some parameterization issues