logging is more clear, some fixes