fixing some things and checking Omar's traces