Fixed Zipf bug (all using same random seed now), + a bit of cleanup