Added comments and better HTML tag support