implemented data ref
misc updates