added general comment, converted attributes into elements