Try to make the buckets explanation a little easier to read. Most of the changes were based on Jamie Allsop (same for the last commit).