mainly support for data injection 

and other fixes