[STABLE] Code cleanup and slight changes

Effects are now longer and do less damage.
Fixed error with previous commit