Fixed bugs/HTML Validation/Comments