Some improvements; converted to Unix line endings