Finishing touches on startup and shutdown routines