Changes that address invlaid URI issues, and adds organisation files
support to the basic info page.
Thanks to John Adams and ADB for pointing out issues with both.