HTML bugfixes. Now validates with w3