Further additions and tweaks. Bed time now...