more documentation massaging
reset the timeout only when the timeout parameter is changed
edit TODOs to be grep friendly