made comments more robust