Add/clarify comments