Better log messages
-f no longer needed when -c is specified
6 files changed