bug fixes and add html list support