modification to properly return name and comment