Minor, minor tweaks after no changes for 2+ months; revamp WIP