Fixed bug with buffs and added shield count