comment bug fixs