Some more minor style tweaks, then calling it for the night.