Comment fixes/clarifications