Add #cr and #lf back. String tweaks