Original commit message from CVS: Various changes and cleanups.
Original commit message from CVS: wtay's version
Original commit message from CVS: mad plugin