bring into sync with live version

Most of the changes are actually just the addition of trailing spaces,
but I was too lazy to go through and fix all of that.