Add html support for atom and small improvements