added hyphen removal and basic xml generation