Added terminal-notifier integration and also tidied up messaging