OK - I think I've found the secret to getting the comments to stay.
1. Write the comment.
2. COPY it before saving because it will disappear.
3. Immediately paste it in again and save again.
Usually it will stick after the 2nd try, but occasionally it seems to need 3 tries.