event-waiting code in client and other miscellaneous fixes.

Signed-off-by: Silas Davis <silas@monax.io>

are captured from a future commit and have been rebased here for easier
comparison!

Signed-off-by: Silas Davis <silas@monax.io>