Cleanup bugloader traces, and add more tags