Better logging
Better formatting of exceptions
Updated the todo