Completed BeamEffect changes

Now, multiple beam effects can be drawn at once and are removed
correctly.