Improved xml normalization; started adding media

XML normalization is now normalizing whitespace and order!