Corrections and html encoding