minor tweaks for yetanotherion's review