more debug enhancments