improve traces

Changed few traces to be able to better find performance
bottlenecks.