Fix signedness, add buckets