Fixed some more stuff. Removed Traces.