line ending normalization turned off, various other updates