Update/clarify some comments