dependency inj fix + minor updates