Minor cleanup and increasing wait times.