nogoegst Use better rand; some uncommitted changes