fixed some replacement values