Added some comments, waits and tweaked times