Updates

Here's some fresh content.  There's a batch of fixes in here, including one which will conflict with Wahn's.  I'd already made the push by the time I'd noticed he'd sent an update.  Go with his over mine for that file.