minor update to ensure ordering in case of bullshit
Refine logging more
Refine logging more