more cleanup and better html.