improve timeout and ah list comments