simplifications, and replacing the line-endings to unix ones, hopefully for the last time