some fixes based on  html validation