Some comment updates and tweaks for clarity.