More carriage control edits