debug & benchmark updates