Some changes; logging-changes