Sync up with the official version

I have one of Kane's changes, and also implemented support for the &user feature and did a  filter setting defect-fix.  You should check with Kane if he has anything else outstanding.