Bug fixes and improvements in header/trace modifications, insert zero trace, waiting cursor