Removed traceur, lots of changes.