merging Joel's actual changes from the line-ending mess