Escaped raw html in descriptions and updated TODO