Added a few minor tweaks.