Improves output and error handling