Adding in wait time computation and trimming down my debug output a bit