small changes. NOTE: tested on smp. it does not crash, but the name nor the buddy will change at the moment.