inject html + few fixes