Several xhtml errors picked up by validator
Merge pull request #23 from Raelith/master

GM Tools work