Small meaningless tweaks.  Also added in more connection state listeners.