add logs, and some exeptions