Most of Version 6.0 (alpha).
Fix line endings.
Further enforce line endings.