fix parameterized errors... to be further tuned