Improve comments and debugging information
Provide better error information to the end user