some buff improvements