some bugs fixed and remove comment feature added