- Fix bugs & html support