more logging
cleanup