Adding additional encodings for autodetect, fixing line wrap bug