comments page fix and some change