A few more minor tweaks.  Time for tea?