Minor tweaks/updates

Just a few minor tweaks and updates.