Update logging messages
Add more command-line options