Removed QWait and organized some more.