Fix key bug and comment label not being removed bug.