Better format and a few changes for w3c compliance.