bug fix in refac name.
major improvments.