less prints, more logging