Write error messages for rename. Also tweak some error outputs, and fix -i.

6 files changed