a few more changes
more changes CRLF and other movings
small corrections