more logs, small fixes