Minor tweaks

Just a few minor tweaks, and one bug fix.