get rid of some rands and fix some merging issues