more logging, moved around some TODOs