Made refinements & fixes.