Add 'retry' notice upon failure
Clean up messaging and add some color