fixed bugs with buckets being passed around