better format names and error messages
2 files changed