Cleaned up and extended tracing of overall notes