fixing some logs and some cleaning