Minimum duration changes

Removed hard-coded 3 second addition to the delay time
Changed the max wait time to a hard-coded 35 sec
Change the "you must wait" message to only show if the time left is 30
seconds or less