More XML config system refactorings and cleanup. works like a treat so far :)