Fix debuff tracking; Modularize codebase