several changes for html validation