Various improvements and tweaks per review and reread.