fix bugs
fix logs errors