Adding sub hooks, formatting changes, scale changes
Cleaned up OnKilled for subs + space in EffectTemplates
Merge