Removed a trace
Minor bugs