Added the waiting for quit packages. Hopefully they work.