[mr3269] Improve Charge effect; partially implement EffectPull