Cleaned up Media and fixed media.xml.