Getting ready for tracing. Other minor updates.