Fixing some XML problems and code standards.