Fix broken link
Misc fixes
Fixed problems with the XML DB