more changes to recording/reporting, syncing trap code change