Better handling of calling done multiple times and the end result being a failure
Better printing of error in the epilogue
Minor cleanup