Added XML Export
Fixed Some Bugs