more logging, cleanup