Add fixing of HTR and Layout Errors

[raykyn]

Finished the code for those annotations that we actually use. We can easily add more if needed.