Fixed a series of minor glitches in the HTML saves.
Merge remote-tracking branch 'origin/master'