Add summary message, and handle errors better