Minor output changes to include timeout information