Correct comments
Add more verbose output.