added timeout to ensure and start/end times, and some formatting