added handling for basic comments and labels