Spaced out a few functions and moved waiter output before wait task