Fix #12, #13. Race condition in comments, comment form looses control