improve documentation; change timeout usage