Updated destructor
bucketSize calculation + minor fixes