Tune log and error messages
Update