Refactoring.
Major rework of export and XML stuff.
XML reader bug fix