Final polishing, but not final validating

Applied changes after running the output through the W3C validation.