better errstr
4 files changed