add html support + small fixes