Build updates
Small fixes for 4.0.1 chat
Reorganizing connect code.  Args need updating.
Better for testing.