Added more logging and changed flag name
6 files changed