Fixed a few items

Changed comments and put back in the waits for data