Added colour ESS indicators, cleaned up trace code.