Update comments; change timeout to constant