few fix + log