changes based on feedback, added timeout error message
cleanup one stray comment