remove windows carriage returns (sigh) and minor changes