added find refs
rename almost done