Use better distributions and improve debugging output