Finishing comment system and some bug fix