Made tracing mandatory

Several other fixes