some old referrences fixed