Default wait time now 60 seconds, some fixes