Minor tweaks, prior to switching over to PHP.