file listing and comment update
merged with upstream