Cleaned up flow control, added breakpoints if a portion of the install process fails