attempt to fix html validation errors
fix more html validation errors
actually fix the stuff in the last commit
fix some stuff up