Fix our waits and re-order to take slightly more advantage of stuff