Edited XML parser and comments