line endings; small improvements