Removed some uneccessary bits, added some HTML5 extras