Fixes + Performance Improvement

Fixes on the Buffs & Changes in the Objects