major work on comment system