Resolved all warnings, set the alarm 15 seconds before the trip ends, more clean up

I set the alarm 15 seconds early so that I don't need to explain
exactly when to start the clock.