Updates

The only real changes are in 4e886298d88783622794f52b659ee076fb3360bc. I was trying to fix the external monitor issue reported on the mailing list.

Even if it doesn’t fix that, this plug-in needed a lot of clean-up.