Added comments, plus a minor fix (no lock)