More function comments.
Use a different logger method if tolerant vs not tolerant.
Fix the import.