add trace and fixes