Feature/more logging