Fixed some minor bugs, updated the logging strategy and added code to support different when exhausted strategies.