Fixed XML structure and added more comments