minor comments and file path changes