better exit handling
4 files changed