added more traces
removed debug traces