Incorporated SphereBucket, did some cleanup.