Tim Kuehn
…nst NUM_BUCKETS; other minor changes