Feature/fix logging