comments and changes to structure